From 57904c8ce6071210998becb5279100c7f3caef22 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 7 Nov 2005 14:30:35 +0000 Subject: [PATCH] Adjust to the stock icon changes. 2005-11-07 Matthias Clasen * configure.in: Adjust to the stock icon changes. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ configure.in | 5 ++--- docs/reference/ChangeLog | 5 +++++ docs/reference/gtk/gtk-update-icon-cache.1 | 11 ++++++++--- docs/reference/gtk/gtk-update-icon-cache.xml | 15 ++++++++++++--- 6 files changed, 35 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8e4615d7bd..c0bc115e13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-11-07 Matthias Clasen + + * configure.in: Adjust to the stock icon changes. + 2005-11-07 Tor Lillqvist * gdk/win32/gdkcursor-win32.c (pixbuf_to_hbitmaps_normal): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8e4615d7bd..c0bc115e13 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +2005-11-07 Matthias Clasen + + * configure.in: Adjust to the stock icon changes. + 2005-11-07 Tor Lillqvist * gdk/win32/gdkcursor-win32.c (pixbuf_to_hbitmaps_normal): diff --git a/configure.in b/configure.in index 193879a1cd..f21ca91c1c 100644 --- a/configure.in +++ b/configure.in @@ -993,10 +993,10 @@ if test $cross_compiling = yes; then fi fi -if test ! -f $srcdir/gtk/stock-icons/gtkstockpixbufs.h && +if test ! -f $srcdir/gtk/gtkbuiltincache.h && test "x$REBUILD_PNGS" = "x#" ; then AC_MSG_ERROR([ -*** gtkstockpixbufs.h is not in the tree, and cannot be built +*** gtkbuiltincache.h is not in the tree, and cannot be built *** because you don't have libpng, or (when cross-compiling) you *** don't have a prebuilt gdk-pixbuf-csource on the host system.]) fi @@ -1628,7 +1628,6 @@ gtk/Makefile gtk/makefile.msc gtk/gtkversion.h gtk/gtk-win32.rc -gtk/stock-icons/Makefile gtk/theme-bits/Makefile gtk/xdgmime/Makefile modules/Makefile diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 2c1115a6d8..e64a7ed69f 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,8 @@ +2005-11-07 Matthias Clasen + + * gtk/gtk-update-icon-cache.xml: + * gtk/gtk-update-icon-cache.1: Document the --source option. + 2005-10-25 Matthias Clasen * gtk/tmpl/gtkfilechooser.sgml: Don't use deprecated functions diff --git a/docs/reference/gtk/gtk-update-icon-cache.1 b/docs/reference/gtk/gtk-update-icon-cache.1 index 8f563d083b..ad488840cf 100644 --- a/docs/reference/gtk/gtk-update-icon-cache.1 +++ b/docs/reference/gtk/gtk-update-icon-cache.1 @@ -2,7 +2,7 @@ .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1). .\" Instead of manually editing it, you probably should edit the DocBook XML .\" source for it and then use the DocBook XSL Stylesheets to regenerate it. -.TH "GTK\-UPDATE\-ICON\-CACH" "1" "08/26/2005" "" "" +.TH "GTK\-UPDATE\-ICON\-CACH" "1" "11/07/2005" "" "" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -11,13 +11,13 @@ gtk\-update\-icon\-cache \- Icon theme caching utility .SH "SYNOPSIS" .HP 22 -\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-index\-only] [\-\-ignore\-theme\-index] [\-\-quiet] {iconpath} +\fBgtk\-update\-icon\-cache\fR [\-\-force] [\-\-ignore\-theme\-index] [\-\-index\-only] [\-\-source\ [name]] [\-\-quiet] {iconpath} .SH "DESCRIPTION" .PP \fBgtk\-update\-icon\-cache\fR creates mmap()able cache files for icon themes. .PP -If expects to be given the path to a icon theme directory containing an +It expects to be given the path to a icon theme directory containing an \fIindex.theme\fR, e.g. \fI/usr/share/icons/hicolor\fR, and writes a \fIicon\-theme.cache\fR @@ -39,6 +39,11 @@ refuses to create an icon cache in a directory which does not appear to be the t \-\-index\-only, \-i Don't include image data in the cache. .TP +\-\-source, \-c +Output a C header file declaring a constant +\fIname\fR +with the contents of the icon cache. +.TP \-\-quiet, \-q Turn off verbose output. .SH "BUGS" diff --git a/docs/reference/gtk/gtk-update-icon-cache.xml b/docs/reference/gtk/gtk-update-icon-cache.xml index ab8b2e180a..6568d5d5f2 100644 --- a/docs/reference/gtk/gtk-update-icon-cache.xml +++ b/docs/reference/gtk/gtk-update-icon-cache.xml @@ -14,8 +14,9 @@ gtk-update-icon-cache --force ---index-only --ignore-theme-index +--index-only +--sourcename --quiet iconpath @@ -44,8 +45,8 @@ multiple applications, the overall memory consumption is reduced as well. --force -f - Overwrite an existing cache file even if it appears to be uptodate. - + Overwrite an existing cache file even if it appears to be + uptodate. @@ -65,6 +66,14 @@ multiple applications, the overall memory consumption is reduced as well. + + --source + -c + Output a C header file declaring a constant + name with the contents of the icon + cache. + + --quiet -q -- 2.30.2